Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 11 Aug 2018 08:26:20 +0000 (10:26 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 11 Aug 2018 08:26:20 +0000 (10:26 +0200)

Trivial merge